Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Thu, 2 Aug 2007 08:02:26 +0000 (09:02 +0100)
committerTim Deegan <Tim.Deegan@xensource.com>
Thu, 2 Aug 2007 08:02:26 +0000 (09:02 +0100)

Trivial merge